Fix for #352