Counter the BC Break introduced by the previous commits