Attempted Fix for Issue #99 - Single Flavor Logic