Improve fab restart