Fix #2

Change-Id: Id1d991a0c8ae409e7ef3d94af3348601fe3041a5
Fix #3

Change-Id: I6da0e4eb62c2027ea2a1b3cb71861aa38e7aa650