Fix of bugfix