BUG FIXING.