Another fix for FF 29