fix few code