Fixes #4960
b16