mirror the fix from Mat
bugfixes with a version bump