Same as previous bugfix, this time appliced to call_exec