Added required patch for previous commit