alisas #38 made into I think the best fix for #40