Maybe actually do things correctly.