fix another regression caused by merging