fixed Decorator
updated version