second try to fix #594