Fixed bug with command defaults