This version fixes two issues: