fixes #1601