Temporary hack to avoid TRAP/exit problems with e-server