Fixed Commands Issue