[fixed] optimizations

Change-Id: I033e5ebe8c83a5f289dfd93e244cff1d9a0ea10d