Fixes variable passing off