Fix #111
Fix 112