Fixes #2864

Fixes #2864