Fix bug #114 on github