Fixes #1359