another fix, hopefully final 2