Fix broken commit and add a test