Quick fix for breaking change