Fix #138