7 Decorator fix