making some fixes for Firefox
fixed conflict