Reinstate bounds check; comment about needed functionality