fix Issue 167