More fixing, still not working