Fixes #1549