Removed unnecessary boundary checks