#21 fixed a bug