Fix for mbstring Issue