Fix #98.
Fix #95.
Fix #96.