BUG FIXING