decorator bug fixed