Fixes #3323 [skip ci]