issues #1 and #2 fixed