fix @first and @last