Fix issue with separating variables