fixed issue 7 according to advice