Fixed #448