Fixes #448