#2215: update to fix the first case