fixes #1547