Fixed issue with the automatic run through