fixes #1420