Fix #30, #32