port to 0.9.5