fixed: access to undefined index.
Merge branch 'develop'