fix compatiable issues
fix compatiable issues