fixed additional collision problems