fix all entity issues once and for all (hopefully)
fix all entity issues once and for all (hopefully)


marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core