fixes #1461