Fixes the issues reported by @danbev