GREEN-handle out of bounds case fix