Fix for #689