Update #429 - Update to handle bug in FF/IE