BUG SOLVED