Fix issue with alignment of variables