Decorator fix