fixing strange bugs ...