Potential undefined fix