r170: the pre-rev not working in all cases