save and create decoration fix