Fixing issue 318