Replaced deprecated eval()