Issue #149: got rid of 'MULTIPLE' variants, and replaced with additional flag