Final fix for #1726
Fix compilation