fixed buuuug