bcjaeger fixing issue #8