Thanks @hussainweb.
Updated patch as per your suggestion.