3.82: fixed broken