Fixed the decorator pattern