Fixes #1561