Fixed #40 (for FF)