ISSUE25 fixed