FIX: new fix for issue #429.