Better fix, still not perfect