Fix callback issue and remove initial validity