bug fix to the bug fix...