Fixes #2344