fixing issue 40