Fixing redundancy bug