fix vars declaration