db mapping fix