fix for ESS hangs during completion