fixes due to 31 avg sprint