fixed 0.6.0 compaibility