Bug fixed and duplication removed