Additional fix for #205.