Fix for #173.