Let's actually do that correctly