and another fix for the same issue :(