Fix submitted as #3471.