added the bug fix to this too