Wrong variable was used. This works fine for 18.08, but in 19.05 this code doesn't work correctly. Bug 6739
