Done, but I had to give some props to the bug too.