fixed issues #4 and #2