Issue fixed and tested