Double initialization removed. Small bug fixed.