Fixes #478