Fixed stray variables