fixed deprecated variables