fixes #1454