Solving bug with validation period.