Initial commit fix