Fixes #2226