I didn't want to mess with helper views. Does that make sense or should we remove that check?