Bug fix for #274.