Fix for #76.