Fixing int issue is maps