Fixed Bug #353, part 2