fixed derp - merged from sgt7