fix variable conversion
Merge branch 'dev' into debian