Fixed 'cannot read length of undefined'.
Merge commit 'HEAD@{1}'