Patch by r1cky in #sumodev; r=bustage fix