Star collision fix
Merge remote-tracking branch 'jaj22/starcollision-fix'