Fixed bugfix fix