Issue #149 Fixed

Fix o line to use public one when needed, tested and validated at customer

(cherry picked from commit 308650dfef78d575e89c009ea6b9e3a72603b752)