Bug fix for bug fix... typical\!