Fix #130