Fix bug 38