Entities are being drawn correctly now