fixed trapping problems - found more : /