Fix for #394