bugfix collision