THE FINAL BUG FIX (or maybe not)