#146 fixed for FF