rhbz996388 - move some work after validation is done