fixes #1515