Fix #104, #95