• Improve the fix for #4
  • Fix #5