Fixes #1305