New patch, with more detail in the commit message, and a test case.