Fix for changes in adfac9202020aa612a64e037034344b88ce6f8ae