fixed issues
fix