Changed things in fixbug