US #29 - Fix js bug on firefox