[WIP] Another fix.