another fix, I'll squash soon