Fix bug 43