updating and fixing issue