@westi - Will this fix be included in 2.8.5 or 2.9?

Thanks for the early fix!