fix for issue 394, need test later