Last bug fix is actually an improvement