Fixing issue 812