fix for entities functionality