Fix for entity not found.