Fixes #4205 [skip ci]