Fixes #1461