Trying to fix #3611