- Bug fixes from the previous version
