added assertion and removed stamp coupling