fixes #1464