Follow up proper regression fix