fix for Bug #39