@vladikoff We want to get this fix into the next train on Monday, so if that's too much trouble we can refactor later.