Bug fix: followup to last "fix"