addresses #1255