Fix #107
Fix #107 (part b)