solving problems

Change-Id: I37dd3785b1b5200b5bbe78dda84903e6493a69e2