Resolved deprecation warning