fix #815