While traveling earlier today I made the patch pushed with the commit referenced above. I saw you made a pull request as well, but I decided to push mine because it avoids few extra assignments that are no longer necessary. If still an issue with the above patch, reopen.