Same problem, testing new solution