should address some of the issues in ticket 484, specifically the stack overflow.