FINAL BUG FIX2