BHV-15468: improved implementation