Now the bug should be fixed