Fix for a hack I had in before that didn't make it back.