small fix, not yet collision fix