Fixes #2278