Fix #91 bug