Bug 254 fix, good work @strujillojr!