Better fix for wakachan