fixed broken 0.6 compatibility