Cond var fix attempt... still broken