fix #6 for real