Octo fix

Closes #410