fix related bugs
fix related bugs