v0.7.9 Critical bug fix