ISSUE20 fixed