port to 0.6 … so close #473