Removed duplicate and fixed bug 2954