Fixing variable calls