Fixes #441