Bugfix for Firefox & Safari