Fixed that terrible template