Removing stub! deprecation warning