Fix for #148.