Fix for #704