Fixing more problems!
Updated version