Issue number 1 fixed