fixing issue 114