FIX: shadowed variable