Fix the deprecation warning?