more bug handling support