#16 I think this is the missing fix on the multiple entity load