Trying to fix #4166