Fixes #1479