issues #2 fixed bug