fix with validation