readjust keys for proper mapping