Fixes #1617