Fix # 131 - no more crash when empty list