fixes #1582