Decorate fix