fixed PR issues