fix for r61 and above