Fix for #353.