[merge] another loose end