Fixes: #2721 Non-existing vars were used