#91 fixed (at least I hope so)