FIX #262  Also, FIX #263