yet another fix to previous fix