really fix #476