v1.01 - bug fix

Change-Id: I75c17369c7fb2d0968ee43ee3220490b0ab6eaf1