fix eager & filter mode problem due to wrapped calls