more bug patch