final bugfixin'