Fixed bug in oct version but still needs proper check