Fix for pull #381.