Please extract this into its own commit as it looks like a fix independent of the rest of the changes.