fixed looping when disc'ing master