latest contrib fix. preparation for release