Fix version 2 to work with org8