Fix #47, #48