issues #1 fixed