Fixes #2888

Fixes #2888