resolved the 'and' mismatch