Fixes #1596