Fixes #473