try to fix #6 again