BUG CLEARED