Fix of fix of bug fix