Fixing #698