Added compatibility with #4077