new validate + fix