Another attempt at fixing given command problem.