Fix for Hybrid

Change-Id: I074efb9bddc8e212a335fc8a9688deb0feda5ce5