Andrei's patch was different from actual source code