update  based on changes in rust (works with 9eb89a6c now)