Fix for #915, enable support in samples