Fix bug 2.0