More bugs (#7)