Fixes #1611