+ fix. + refactor

Change-Id: I0f03fcdbc5882cf7689084f36fd149ef5e560cb4