Fix #76
Close #76