FIX #15 #16 #22