Fix for FF 28