ISSUE40 fixed