punches now handle roles correctly