Fixes #2646