fixes #4367

Tested locally on 2.5