Fixing #448