Fix body validation