Fixes #1547