Temporarily removed variables check