quick fix before .17 release