catch corner case in getValueAt()
Merge remote-tracking branch 'origin/master'