Fix of the bug fix