Rolling regression fix (for real this time)

Rolling regression fix (for real this time) #446