Fixes #1670