Yes your mandup is right............ need 12months from date of RP stamped not from date of entry....