fixed previous check-in for #1575