bug fix (maybe)