Fixing for new implementations