fixed occurances of previous bug.  Submit 2 (For real)