fix bug #43
Merge branch 'bug43'