synchronized with 0.3.5