Another try to solve the "wrong column index in the substitute callback" issue (#16).