#910: Added fix for Firefox