fixed PR problems