fixed issue number 2