CLI update

The workarounds should be working. Please double check.