Test & quick fix for #257.