addresses #1265