fixing issue 26