- hopefully fix entity issues - #1199