Fixes #1326