Temporary fix to pass the validator