fix for last night refact