fix Bug #223