Fix bug #135