Fix close event from Decorator