Fixes #1486