Fixes #1519