Fixed #383