Fixes #1564