Code fix for #118.