FF fix update from master