Fix @undefined issue