Fixing map call