fixed straight issues