RELOAD-169 Fixed the bug on Firefox and Safari