Fixed inner variables for real now