Improvement made to support Firefox and IE