Fixes #435