This patch works as intended for me. Issuing RTBC.
Thanks!