Fix splatting boundary checks