Same fix for mac32
Same fix for dragonfly