Quick hack to make validation traceable