Temp command pattern fix