HYBRID fix

Change-Id: Iefa4cc6f4f1b2defea26284ae6d5526e4bd70675