patched things up a bit