Bugs in previous commit