#3275 fix