Fix bug 24''