Missing return in command calls fixed