Fixes #433