fixes to esc version