synchonized with new v0.8.4