more bug handling