Fix for #354