Fix for # 94.