FIX #24 and FIX #25