Fixed #20,21,22