Initial creation fix