Fix for safety + Fix for Opera