Revert "not working with ExpWrapper"

This reverts commit 8224bfefcfe3d787afca8399bca9a56d77acec5f.