bugfixed entity