FIX: Proper treatment of adjusted/base visitor demand in previous commit