issue 36 and 22