Fixing issue 8, again....