Added fix from DE to test, works great