fix for better validation errors