fixed issue 10 according to advice