Fixes #1648