[#79] Changes to [ method