Fixes #1641