Additional fix for #274.