Avoid deprecation warning due to changing defaults