finally fix it