Fix for #356.