Fixed entity size issue