fixes #1431