Bugfix on deprecated variable