fixing collision bugs
fixed collision bugs