Moved field repair to current