AS7-6474: move return to proper place