fixing issue