fix #9 for real this time