Fixing it some more