Complex commands fix