Fixes #1588