Fix #96