Fix for FF issue #4