Revert back After = line test and fix it