fixes #1479