Improve accuracy

Change-Id: I7f7028d60d521f8d566cfe51066e09b940c17348