Make sure to return the right values during validation