Fix bug in validation. Accuracy greatly increase