Implementation that was missing and broke tests