Fix #1

Change-Id: I5ff743a6c4c1628d9eba4e08a14608fcd0cbcf15
Fix #2

Change-Id: Id1d991a0c8ae409e7ef3d94af3348601fe3041a5