Fix for No command screen