Thanks, didn't paid attention to RawDataDecorator, so my first try was right (by accident). =)

I will change it.