More variable fix