Fixed bug in 6.20