Fix for 'too many items to unpack' error.