Fixes #2386