Fixed rounds bugs