Cleaned up Entities API bug.