Fixing traling slash issue JOINDIN-245