Fix bug 100