Fix some problem with decorators