Fixes #1793