More complexity fixing