quickly patching things will end up in needing three commits just for the same problem. lesson (hopefully) learned.