Completed merge fix