fixes #1370