Fixes undefined index #19