hotfix: collision bug