Fixes #469