Fixes #445