fix(costume): better fix for #4274