Should Fix #364
Fixed #386.