Moves bugfix to more robust location