Fix for new entity mapping