bug fix for the bug fix