Fix firefox and Safari