Definite fix for #697