Bug FIx - Wrong object