Fixes #2260 (maintenance)

Fixes #2260