Fix bug #132