FIX #262