Issues #6 #7 fix