Fixed bug for FF