NOW the bug should be fixed.