FIX #294