BUG CORRECTED