fixes #1673