yet another fix for the previous patch