Fixes #437