FIX #266