Bug fix for Firefox