Bug fix and version bump