Great. Thanks for the quick patch. I will modify the rest of the stuff and commit to the branch soon.