fix Issue 121