Bounds fix