Resolve issue with variable declaration with comma