Fixes #1357