Cristian: fixed marionette conflict with logon