fixed pr issues