really fix #1080