fix #322 for serious this time.