Fix bug #136