FIX #6 #7