Actually fix it properly