Fix #95