move vars
Don't complete empty line, lp:1340824

fixed