Fixes #4936 [skip ci]