Attempt to fix this problem
Fix post-validation issues