Fix potential undefined index error
Merge branch 'operator-equals-fix' into voycer-bugfixes

* operator-equals-fix:
  Fix potential undefined index error