Patch for #1314

Quick fix