Fixes #2209