Fix for FF<18