really fix #2