fixes #1487