fixed octo issues