fixes #1481