Possible choppyness fix