Multi View Fix

Change-Id: I030bd64ae1d5191c0ede25ab78b80f9afbcc36b6