fix for #718 & #719