Fixes #1651