Fixes #2342