Code

Added fix to avoid undefined index