Fixes #2254