Fixed t -> r