Fixing entity mapping relation