update to be 3.5-compatible