Fixing count now that validation is in place