#1 fixed issue 1
#2 fixed issue 1