fixes #1588