Fixes #1644