bug fix, the sequel