Corrected entity behaviour with 1.5 changes