fixed entity layout (see #1581)