partial fix to esn issues