FIX #268