Should have fixed assumptions about entity width.

@madmaxoft can you comment?