Removed fiddly collision hack