Extend one bug fix...