Fixing issue 800