fixed bug on entity storage