Fixing AbstractEntityBodyDecorator