Build changes for Bug fix for Create called twice