Another helper fix