Another bug-fix for my recent code