Make vars return properly