Fixing command execution