FIX: additional fix for #429.