fix for one part of ticket #39