fix decorator part1