work towards fixing newly introduced break-* bug