added validation for fish