[#658] Fixed some issues nate found with previous fix
Authored by: Jenny Steele 2010-07-26
Parent(s): [1c1bea]
Child(ren): [48a116]