Fix for now, will need to revisit

Change-Id: I1cb9d6ec92951469debe1e794946e95e369b5e2f