#1 fixed bug