Need fix for validation