#11 fixed bug