buggy commit stuff