ISSUE 21 fixed