Fixes #1566