Fixes #477