More bounds checking