make it all consistent again