FINAL BUG FIX!!!!!!!!!!!!!!!!!!!!!!!