Temporary fix for #725