resupport 0.8 after bug fix