this is issue #6 #7