Fixes #453