Little more tweaking on entity collision