Fix #3 for FF