Definite fix for #103.