Changes to fix map