another fix, hopefully final