Fix #76, #77