Try fix to #4151