0.6.1 OBI with source-options fixed