try to fix #478