Fix for entities