Fixed mix-up with variables