FIX #8 #15 #16 #17 #18 #21 #22 #23 #24