Fixes #1604