Fixes #1563