Fixed decorator bug