moar fixing bug