Fix bounds

Change-Id: I61ce5563d90bb2cf8d186586f15ef4318acdc963