Commands fix