Fixes #1684