addresses #3460