bug fix, one last time