Same problem, better solution