Fix Command-sender