BUG FIXEEEEEEEEEES...