OCT-6 and fixes #864