fix #204 for good this time