Fixes #1578