Fixes #1628