fix bug and validate