Fix for #353