make some bug fixes to atomicExpResolver